Move initialization code from _new to _init. (#168249, Murray Cumming)

2005-02-23  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaboutdialog.c (gtk_about_dialog_init)
	(gtk_about_dialog_new): Move initialization code from _new to
	_init.  (#168249, Murray Cumming)

diff --git a/ChangeLog b/ChangeLog
index 8a4238d9a779973fbede0c48995858b7c1894b75..e720c98df933b88cf1f1bf564bfd1a14b560637f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaboutdialog.c (gtk_about_dialog_init) 
+       (gtk_about_dialog_new): Move initialization code from _new to 
+       _init.  (#168249, Murray Cumming) 
+
 Wed Feb 23 17:34:01 2005  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_node_queue_redraw): Patch from

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8a4238d9a779973fbede0c48995858b7c1894b75..e720c98df933b88cf1f1bf564bfd1a14b560637f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaboutdialog.c (gtk_about_dialog_init) 
+       (gtk_about_dialog_new): Move initialization code from _new to 
+       _init.  (#168249, Murray Cumming) 
+
 Wed Feb 23 17:34:01 2005  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_node_queue_redraw): Patch from

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8a4238d9a779973fbede0c48995858b7c1894b75..e720c98df933b88cf1f1bf564bfd1a14b560637f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaboutdialog.c (gtk_about_dialog_init) 
+       (gtk_about_dialog_new): Move initialization code from _new to 
+       _init.  (#168249, Murray Cumming) 
+
 Wed Feb 23 17:34:01 2005  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_node_queue_redraw): Patch from

diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 5a3e983912b05f87e48e55facfdbf57b023c3732..1224a4ca754548c7951b843b3107d7adf6958f9b 100644 (file)
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -158,6 +158,7 @@ static void                 display_credits_dialog          (GtkWidget
                                                             gpointer            data);
 static void                 display_license_dialog          (GtkWidget          *button,
                                                             gpointer            data);
+static void                 close_cb                        (GtkAboutDialog     *about);
                                 
                                                                       
 static GtkAboutDialogActivateLinkFunc activate_email_hook = NULL;
@@ -506,6 +507,13 @@ gtk_about_dialog_init (GtkAboutDialog *about)
   gtk_window_set_resizable (GTK_WINDOW (about), FALSE);
 
   gtk_widget_pop_composite_child ();
+
+  /* force defaults */
+  gtk_about_dialog_set_name (about, NULL);
+  gtk_about_dialog_set_logo (about, NULL);
+
+  /* Close dialog on user response */
+  g_signal_connect (about, "response", G_CALLBACK (close_cb), NULL);
 }
 
 static void
@@ -2091,16 +2099,6 @@ gtk_about_dialog_new (void)
 {
   GtkAboutDialog *dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG, NULL);
 
-  /* force defaults */
-  gtk_about_dialog_set_name (dialog, NULL);
-  gtk_about_dialog_set_logo (dialog, NULL);
-
-  /* Close dialog on user response */
-  g_signal_connect (dialog,
-                    "response",
-                    G_CALLBACK (close_cb),
-                    NULL);
-
   return GTK_WIDGET (dialog);
 }